RCSMERGE(1) Unix Programmer's Manual RCSMERGE(1) NNNAAAMMMEEE rcsmerge - merge RCS revisions SSSYYYNNNOOOPPPSSSIIISSS rrrcccsssmmmeeerrrgggeee [_o_p_t_i_o_n_s] _f_i_l_e DDDEEESSSCCCRRRIIIPPPTTTIIIOOONNN rrrcccsssmmmeeerrrgggeee incorporates the changes between two revisions of an RCS file into the corresponding working file. A file name ending in ,,,vvv is an RCS file name, otherwise a working file name. rrrcccsssmmmeeerrrgggeee derives the working file name from the RCS file name and vice versa, as explained in cccooo(1). A pair consisting of both an RCS and a working file name may also be specified. At least one revision must be specified with one of the options described below, usually ---rrr. At most two revisions may be specified. If only one revision is specified, the latest is omitted, the latest revision on the default branch (normally the highest branch on the trunk) is assumed for the second revision. Revisions may be specified numerically or symbolically. rrrcccsssmmmeeerrrgggeee prints a warning if there are overlaps, and delimits the overlapping regions as explained in cccooo\\\ ---jjj. The command is useful for incorporating changes into a checked-out revision. OOOPPPTTTIIIOOONNNSSS ---kkk_s_u_b_s_t Use _s_u_b_s_t style keyword substitution. See cccooo(1) for details. For example, ---kkkkkk\\\ ---rrr111...111\\\ ---rrr111...222 ignores differences in keyword values when merging the changes from 111...111 to 111...222. ---ppp[rev]]] Send the result to standard output instead of overwriting the working file. ---qqq[rev]]] Run quietly; do not print diagnostics. ---rrr[rev]]] Merge with respect to revision _r_e_v. ---VVV_n Emulate RCS version _n. See cccooo(1) for details. EEEXXXAAAMMMPPPLLLEEESSS Suppose you have released revision 2.8 of fff...ccc. Assume furthermore that after you complete an unreleased revision 3.4, you receive updates to release 2.8 from someone else. To combine the updates to 2.8 and your changes between 2.8 and 3.4, put the updates to 2.8 into file f.c and execute rrrcccsssmmmeeerrrgggeee ---ppp ---rrr222...888 ---rrr333...444 fff...ccc >>>fff...mmmeeerrrgggeeeddd...ccc \*(Dt 1 RCSMERGE(1) Unix Programmer's Manual RCSMERGE(1) Then examine fff...mmmeeerrrgggeeeddd...ccc. Alternatively, if you want to save the updates to 2.8 in the RCS file, check them in as revision 2.8.1.1 and execute cccooo ---jjj: ccciii ---rrr222...888...111...111 fff...ccc cccooo ---rrr333...444 ---jjj222...888:::222...888...111...111 fff...ccc As another example, the following command undoes the changes between revision 2.4 and 2.8 in your currently checked out revision in fff...ccc. rrrcccsssmmmeeerrrgggeee ---rrr222...888 ---rrr222...444 fff...ccc Note the order of the arguments, and that fff...ccc will be overwritten. DDDIIIAAAGGGNNNOOOSSSTTTIIICCCSSS Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble. IIIDDDEEENNNTTTIIIFFFIIICCCAAATTTIIIOOONNN Author: Walter F. Tichy. Revision Number: 5.1; Release Date: 1990/08/29. Copyright (c) 1982, 1988, 1989 by Walter F. Tichy. Copyright (c) 1990 by Paul Eggert. SSSEEEEEE AAALLLSSSOOO ci(1), co(1), ident(1), merge(1), rcs(1), rcsdiff(1), rcsintro(1), rlog(1), rcsfile(5) Walter F. Tichy, RCS--A System for Version Control, _S_o_f_t_w_a_r_e--_P_r_a_c_t_i_c_e & _E_x_p_e_r_i_e_n_c_e 111555, 7 (July 1985), 637-654. \*(Dt 2